Make version strings consistent across all interfaces.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
index 64eaa9fe7827515379d976f7c6ae3f78cfddf671..220cf8fd7a5b0dbb2bc18c3bfa4afdfba5761e06 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
@@ -3,7 +3,7 @@
 
 .section __xen_guest
        .ascii  "GUEST_OS=linux,GUEST_VER=2.6"
-       .ascii  ",XEN_VER=3.0"
+       .ascii  ",XEN_VER=xen-3.0"
        .ascii  ",VIRT_BASE=0xC0000000"
 #ifdef CONFIG_X86_PAE
        .ascii  ",PAE=yes"

diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S
index b1418e6afeb31f164fad31c61c52da0f70bbebf9..c22996e8e4e1b774733bd0c8942bcd0412905d41 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S
@@ -16,7 +16,7 @@
 #include <linux/linkage.h>
 
 .section __xen_guest
-       .ascii  "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xffffffff80000000"
+       .ascii  "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=xen-3.0,VIRT_BASE=0xffffffff80000000"
        .ascii  ",LOADER=generic"
 /*     .ascii  ",PT_MODE_WRITABLE" */
        .byte   0

diff --git a/tools/libxc/xc_load_elf.c b/tools/libxc/xc_load_elf.c
index 9d00be1e78b03796855895fc8d3e2b7341362a76..ac8fb81ccc9032437eae56bc34d8fe984f47349f 100644 (file)
--- a/tools/libxc/xc_load_elf.c
+++ b/tools/libxc/xc_load_elf.c
@@ -109,7 +109,7 @@ static int parseelfimage(char *image,
             return -EINVAL;
         }
 
-        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
+        if ( (strstr(guestinfo, "XEN_VER=xen-3.0") == NULL) )
         {
             ERROR("Will only load images built for Xen v3.0");
             ERROR("Actually saw: '%s'", guestinfo);

diff --git a/xen/common/elf.c b/xen/common/elf.c
index 08ff377d7c84402b0bef2b47c984b9fc67d5ab9b..4fc8f26ecd6726c21dfa9885d4fd780d33dfbdde 100644 (file)
--- a/xen/common/elf.c
+++ b/xen/common/elf.c
@@ -71,7 +71,7 @@ int parseelfimage(struct domain_setup_info *dsi)
             return -EINVAL;
         }
 
-        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
+        if ( (strstr(guestinfo, "XEN_VER=xen-3.0") == NULL) )
         {
             printk("ERROR: Xen will only load images built for Xen v3.0\n");
             return -EINVAL;